6aac3655267d17513e1a4ed62a875b422d5daad9,software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java,RiakNodeSshDriver,joinCluster,#RiakNode#,194

Before Change


                    .body.append(format("%s cluster join %s", getRiakAdminCmd(), riakName))
                    .body.append(format("%s cluster plan", getRiakAdminCmd()))
                    .body.append(format("%s cluster commit", getRiakAdminCmd()))
                    .failOnNonZeroResultCode()
                    .execute();

            entity.setAttribute(RiakNode.RIAK_NODE_IN_CLUSTER, Boolean.TRUE);
        } else {

After Change


        if (!isInCluster()) {
            String riakName = node.getAttribute(RiakNode.RIAK_NODE_NAME);

            ScriptHelper joinClusterScript = newScript("joinCluster")
                    .body.append(format("%s cluster join %s", getRiakAdminCmd(), riakName))
                    .body.append(format("%s cluster plan", getRiakAdminCmd()))
                    .body.append(format("%s cluster commit", getRiakAdminCmd()))
                    .failOnNonZeroResultCode();

            if (!isRiakOnPath) {
                Map<String, String> newPathVariable = ImmutableMap.of("PATH", sbinPath);
                log.warn("riak command not found on PATH. Altering future commands' environment variables from {} to {}", getShellEnvironment(), newPathVariable);
                joinClusterScript.environmentVariablesReset(newPathVariable);
            }

            joinClusterScript.execute();


            entity.setAttribute(RiakNode.RIAK_NODE_IN_CLUSTER, Boolean.TRUE);